Auto merge of #3635 - alexcrichton:bump, r=alexcrichton

author bors <bors@rust-lang.org>

Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)

committer bors <bors@rust-lang.org>

Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)
author bors <bors@rust-lang.org>
Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)
committer bors <bors@rust-lang.org>
Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)
diff --cc Cargo.lock
Simple merge
diff --cc Cargo.toml
Simple merge
author	bors <bors@rust-lang.org>
	Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)
committer	bors <bors@rust-lang.org>
	Fri, 3 Feb 2017 05:58:33 +0000 (05:58 +0000)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history